Fix Swift generator naming collisions#5
Merged
Conversation
VojtechVitek
approved these changes
Jun 4, 2026
VojtechVitek
left a comment
There was a problem hiding this comment.
LGTM.
Can you regenerate the examples and potentially add some unit tests (with Claude)?
39d7ffd to
a724923
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
.unknownand using a separate associated-value fallback for unrecognized wire valuesCodingKeysenums so structs and method wrappers with no exported fields compileTrails API verification
Verified against
../trails-api/proto/trails-api.ridlwith-service=Trails -methodTreeShake -ignore=@onramp. Fresh Swift output:public func runtimeStatus()as the client method/rpc/Trails/RuntimeStatusas the wire pathTrailsApiTrailsAPI.RuntimeStatusMethodfor the nested method namespace, avoiding the top-levelRuntimeStatusDTO collision.unknownValue(String)for enums in that schema that already defineUNKNOWNenum CodingKeys: CodingKeyfor empty generated request/response structsTest Plan
go test ./..../Tests/test.shgo -C tools tool webrpc-gen -schema=../../trails-api/proto/trails-api.ridl -target=.. -client -service=Trails -methodTreeShake -ignore=@onramp -out=/tmp/trails-relative.gen.swiftswiftc -parse-as-library -target arm64-apple-macosx12.0 -c /tmp/trails-relative.gen.swift -o /tmp/trails-relative.gen.org -n '(/Users/|manual|FIXME|TODO|RuntimeStatusMethod|enum CodingKeys: CodingKey|unknownValue)' /tmp/trails-relative.gen.swift